From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Wed, 10 May 2006 14:58:16 +0000 (+0100)
Subject: Fix a couple of problems in the TPM backend driver.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16047^2~98
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=4420b4b625cd581e44b4301f5f0ad89f465a9661;p=xen.git

Fix a couple of problems in the TPM backend driver.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
---

diff --git a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c
index 24216605be..4d38953444 100644
--- a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c
+++ b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c
@@ -745,9 +745,9 @@ failexit:
 
 static void __exit tpmif_exit(void)
 {
+	exit_tpm_xenbus();
 	cleanup_vtpm();
 	tpm_private_put();
-	exit_tpm_xenbus();
 	gnttab_free_grant_references(gref_head);
 }
 
diff --git a/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c b/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c
index be4988239b..0992ad962d 100644
--- a/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/interface.c
@@ -179,7 +179,7 @@ void __init tpmif_interface_init(void)
 					 0, 0, NULL, NULL);
 }
 
-void __init tpmif_interface_exit(void)
+void __exit tpmif_interface_exit(void)
 {
 	kmem_cache_destroy(tpmif_cachep);
 }